From 1a7a089e2c2e1886c5481e6b980f1f138f9cec7c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Wed, 3 May 2017 16:37:55 +0200 Subject: [PATCH] window: Stop using gtk_widget_get_preferred* --- gtk/gtkwindow.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index e7f168059e..6efc3cc89b 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -8927,7 +8927,7 @@ gtk_window_move_resize (GtkWindow *window) if (priv->configure_notify_received) { GtkAllocation allocation; - int min, nat; + int min; /* If we have received a configure event since * the last time in this function, we need to @@ -8946,9 +8946,11 @@ gtk_window_move_resize (GtkWindow *window) allocation.y = 0; /*allocation.width = current_width;*/ - gtk_widget_get_preferred_width (widget, &min, &nat); + gtk_widget_measure (widget, GTK_ORIENTATION_HORIZONTAL, -1, + &min, NULL, NULL, NULL); allocation.width = MAX (min, current_width); - gtk_widget_get_preferred_height_for_width (widget, allocation.width, &min, &nat); + gtk_widget_measure (widget, GTK_ORIENTATION_VERTICAL, allocation.width, + &min, NULL, NULL, NULL); allocation.height = MAX (min, current_height); gtk_widget_size_allocate (widget, &allocation); -- 2.30.2